Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Sonokai theme to better match original #5379

Merged
merged 3 commits into from
Feb 17, 2024
Merged

Fix Sonokai theme to better match original #5379

merged 3 commits into from
Feb 17, 2024

Conversation

NickCondron
Copy link
Contributor

@NickCondron NickCondron commented Jan 3, 2023 •
edited
Loading

The Sonokai theme had some inconsistencies, so I fixed some of them.

  1. https://www.sainnhe.dev/post/contributing-guide/#sonokai
  2. https://github.com/sainnhe/sonokai/blob/master/colors/sonokai.vim

Edit: Changes I made as listed in the git commit:

  • Make constants white (1)
  • Make builtin variables purple (1)
  • Make members orange (1)
  • Make labels red (2)
  • Make operators red (1)
  • Make all punctuation grey (2)
  • Make builtin functions and macros green (2)
  • Make diff delta blue (2)
  • Make cursor match bg4 (2)
  • Make visible whitespace bg4 (2)

@the-mikedavis the-mikedavis added A-theme Area: Theme and appearence related S-waiting-on-review Status: Awaiting review from a maintainer. labels Jan 3, 2023
@the-mikedavis
Copy link
Member

\cc @p4ymak what do you think about these colors (since you originally ported sonokai)?

@NickCondron NickCondron mentioned this pull request Jan 9, 2023
Merged
@CptPotato
Copy link
Contributor

I think this theme is based on my port of sonokai. I intentionally made some adjustments that I personally preferred.

But I'm fine with changing the theme here, the other version is still available on my repo.

@NickCondron
Copy link
Contributor Author

NickCondron commented Jan 23, 2023 •
edited
Loading

Copying @p4ymak comments here because his comment was made in error on another PR:

@the-mikedavis
sorry for long respond.

in my opinion, in general, the palette has become better. there are only two things I don't like: macros are no different from functions now, and parentheses and punctuation are too dim.

  1. Sonokai colors constant-macros purple and function-macros green. Helix does not currently have scopes that differentiate the two kinds. Given that Helix does have a "function.macro" scope I went with green.
  2. Sonokai clearly makes brackets and delimiters grey (https://github.com/sainnhe/sonokai/blob/e2e89497f178bec568a0a43cda651f0429ec8ec1/colors/sonokai.vim#L434). I understand that could be too dark for some tastes, but I think it makes sense to stick to the original as much as possible. I did realize that Sonokai makes special punctuation yellow, so I will amend the theme to add that.

@archseer
Copy link
Member

archseer commented Feb 2, 2023

Was the review fully addressed here?

@the-mikedavis
Copy link
Member

I lost track of this PR a little - if you're still interested in updating these scopes could you rebase / merge master?

@the-mikedavis the-mikedavis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from a maintainer. labels Feb 10, 2024
@NickCondron
Make sonokai palette perfectfully faithful
36ce58c
@NickCondron
Amend theme to better match original sonokai
8ad5bba 
Changes based on the following references:
(1) https://www.sainnhe.dev/post/contributing-guide/#sonokai
(2) https://github.com/sainnhe/sonokai/blob/master/colors/sonokai.vim

* Make constants white (1)
* Make builtin variables purple (1)
* Make members orange (1)
* Make labels red (2)
* Make operators red (1)
* Make all punctuation grey (2)
* Make builtin functions and macros green (2)
* Make diff delta blue (2)
* Make cursor match bg4 (2)
* Make visible whitespace bg4 (2)
@NickCondron
Make Sonokai special punctuation yellow
1bc6288
@NickCondron
Copy link
Contributor Author

When I wrote this PR I was learning Helix. I no longer use the editor. Respectfully, I don't want to spend a whole lot of time on this. If it's an improvement and works I would be thrilled if it were merged. If not, hopefully someone else can expand on what I did.

I chose fidelity to the original theme where possible. However, I'm not the one who should decide on different color variations for secondary selections or other Helix-specific things. I tried to respect the more recent PRs. Also, I don't know if other scopes have been added/changed since I originally made the PR that could make this theme better.

@the-mikedavis the-mikedavis added S-waiting-on-review Status: Awaiting review from a maintainer. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 17, 2024
@pascalkuthe pascalkuthe merged commit 6ffe09e into helix-editor:master Feb 17, 2024
6 checks passed
uek-1 pushed a commit to uek-1/helix that referenced this pull request Feb 24, 2024
@NickCondron @uek-1
Fix Sonokai theme to better match original (helix-editor#5379)
1009af7 
* Make sonokai palette perfectfully faithful

* Amend theme to better match original sonokai

Changes based on the following references:
(1) https://www.sainnhe.dev/post/contributing-guide/#sonokai
(2) https://github.com/sainnhe/sonokai/blob/master/colors/sonokai.vim

* Make constants white (1)
* Make builtin variables purple (1)
* Make members orange (1)
* Make labels red (2)
* Make operators red (1)
* Make all punctuation grey (2)
* Make builtin functions and macros green (2)
* Make diff delta blue (2)
* Make cursor match bg4 (2)
* Make visible whitespace bg4 (2)

* Make Sonokai special punctuation yellow
cosmikwolf pushed a commit to cosmikwolf/helix that referenced this pull request Feb 26, 2024
@NickCondron @cosmikwolf
Fix Sonokai theme to better match original (helix-editor#5379)
417926b 
* Make sonokai palette perfectfully faithful

* Amend theme to better match original sonokai

Changes based on the following references:
(1) https://www.sainnhe.dev/post/contributing-guide/#sonokai
(2) https://github.com/sainnhe/sonokai/blob/master/colors/sonokai.vim

* Make constants white (1)
* Make builtin variables purple (1)
* Make members orange (1)
* Make labels red (2)
* Make operators red (1)
* Make all punctuation grey (2)
* Make builtin functions and macros green (2)
* Make diff delta blue (2)
* Make cursor match bg4 (2)
* Make visible whitespace bg4 (2)

* Make Sonokai special punctuation yellow
postsolar pushed a commit to postsolar/helix that referenced this pull request Apr 4, 2024
@NickCondron @postsolar
Fix Sonokai theme to better match original (helix-editor#5379)
c415294 
* Make sonokai palette perfectfully faithful

* Amend theme to better match original sonokai

Changes based on the following references:
(1) https://www.sainnhe.dev/post/contributing-guide/#sonokai
(2) https://github.com/sainnhe/sonokai/blob/master/colors/sonokai.vim

* Make constants white (1)
* Make builtin variables purple (1)
* Make members orange (1)
* Make labels red (2)
* Make operators red (1)
* Make all punctuation grey (2)
* Make builtin functions and macros green (2)
* Make diff delta blue (2)
* Make cursor match bg4 (2)
* Make visible whitespace bg4 (2)

* Make Sonokai special punctuation yellow
mtoohey31 pushed a commit to mtoohey31/helix that referenced this pull request Jun 2, 2024
@NickCondron @mtoohey31
Fix Sonokai theme to better match original (helix-editor#5379)
f1f7299 
* Make sonokai palette perfectfully faithful

* Amend theme to better match original sonokai

Changes based on the following references:
(1) https://www.sainnhe.dev/post/contributing-guide/#sonokai
(2) https://github.com/sainnhe/sonokai/blob/master/colors/sonokai.vim

* Make constants white (1)
* Make builtin variables purple (1)
* Make members orange (1)
* Make labels red (2)
* Make operators red (1)
* Make all punctuation grey (2)
* Make builtin functions and macros green (2)
* Make diff delta blue (2)
* Make cursor match bg4 (2)
* Make visible whitespace bg4 (2)

* Make Sonokai special punctuation yellow
Vulpesx pushed a commit to Vulpesx/helix that referenced this pull request Jun 7, 2024
@NickCondron @Vulpesx
Fix Sonokai theme to better match original (helix-editor#5379)
3bc41f5 
* Make sonokai palette perfectfully faithful

* Amend theme to better match original sonokai

Changes based on the following references:
(1) https://www.sainnhe.dev/post/contributing-guide/#sonokai
(2) https://github.com/sainnhe/sonokai/blob/master/colors/sonokai.vim

* Make constants white (1)
* Make builtin variables purple (1)
* Make members orange (1)
* Make labels red (2)
* Make operators red (1)
* Make all punctuation grey (2)
* Make builtin functions and macros green (2)
* Make diff delta blue (2)
* Make cursor match bg4 (2)
* Make visible whitespace bg4 (2)

* Make Sonokai special punctuation yellow
smortime pushed a commit to smortime/helix that referenced this pull request Jul 10, 2024
@NickCondron
Fix Sonokai theme to better match original (helix-editor#5379)
6ef1e75 
* Make sonokai palette perfectfully faithful

* Amend theme to better match original sonokai

Changes based on the following references:
(1) https://www.sainnhe.dev/post/contributing-guide/#sonokai
(2) https://github.com/sainnhe/sonokai/blob/master/colors/sonokai.vim

* Make constants white (1)
* Make builtin variables purple (1)
* Make members orange (1)
* Make labels red (2)
* Make operators red (1)
* Make all punctuation grey (2)
* Make builtin functions and macros green (2)
* Make diff delta blue (2)
* Make cursor match bg4 (2)
* Make visible whitespace bg4 (2)

* Make Sonokai special punctuation yellow
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pascalkuthe pascalkuthe pascalkuthe approved these changes

@the-mikedavis the-mikedavis the-mikedavis approved these changes

Assignees
No one assigned
Labels
A-theme Area: Theme and appearence related S-waiting-on-review Status: Awaiting review from a maintainer.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@NickCondron @the-mikedavis @CptPotato @archseer @pascalkuthe